gh-155315: Fix marshal round-trip of shared frozendict references - #155316
Merged
serhiy-storchaka merged 2 commits intoAug 17, 2026
Conversation
The TYPE_FROZENDICT reader reserved a reference slot but never filled it with r_ref_insert, unlike TYPE_FROZENSET, so a frozendict referenced more than once failed to load with ValueError.
serhiy-storchaka
approved these changes
Aug 16, 2026
serhiy-storchaka
left a comment
serhiy-storchaka
left a comment
Member
There was a problem hiding this comment.
LGTM, but please remove the excessive comment.
| } | ||
| if (type == TYPE_FROZENDICT && v != NULL) { | ||
| Py_SETREF(v, PyFrozenDict_New(v)); | ||
| /* frozendicts use delayed reference registration (like |
Member
There was a problem hiding this comment.
This comment is redundant. There are no such comments for frozenset, etc.
serhiy-storchaka
added
the
needs backport to 3.15
Member
|
And please move NEWS to Core_and_Builtins. |
Contributor
Author
|
Done in 21bc04f: dropped the comment and moved the NEWS to Core_and_Builtins. |
serhiy-storchaka
approved these changes
Aug 17, 2026
|
Thanks @tonghuaroot for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.15. |
|
GH-155945 is a backport of this pull request to the 3.15 branch. |
bedevere-app
Bot
removed
the
needs backport to 3.15
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
TYPE_FROZENDICTreader reserved a reference slot withr_ref_reservebutnever filled it with
r_ref_insert, so afrozendictreferenced more than oncein the marshalled data failed to load with
ValueError: bad marshal data (invalid reference). This mirrors theTYPE_FROZENSETreader, which alreadycalls
r_ref_insert.